Merge "Adding empty locale-config case" into tm-dev am: 1e5ed56a am: a0a17b97

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



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