Merge "Update to check package name for multi-instnaces split" into tm-qpr-dev...

Merge "Update to check package name for multi-instnaces split" into tm-qpr-dev am: fc4b33ec am: 7cb5a141

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



Change-Id: I77c56421e7962111d7ed053b42477e9044faae75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>