Merge "update TEST_MAPPING by using new e2e test apk" into sc-v2-dev am: 3187af46 am: 9cb5f433

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

Change-Id: Ic68a8f15a84781808f82cd27e420f6966f64ae19