Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev am: ebe2773f3d am: daf1861655 am: 6cf9be197f am: 420bc87fdf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000934

Change-Id: Iac664d7ff4885c3ba6606aa46b6ffa9b92c9cb2e