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: 0b073262

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



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