Merge "Update for compatibility with region subject" into udc-dev am: aab81829

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



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