Merge "Only override embedded activity locale if source package lookup yields...

Merge "Only override embedded activity locale if source package lookup yields locales to match" into udc-dev am: 68a12cca

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



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