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

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



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