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 am: 37dac423

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



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