r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Merge "Convert apct/text/text_native_test-cloud-tf to Test Mapping Suite." am: e86af6134d am: 036dae36bd am: 56ce75a951

Change-Id: Ib7e4c6822e679df2c429392fbacafff79d41f46b