Merge "Update com.android.statementservice to support v2 API" into sc-dev