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: I94abb2cb7f0f53dd2f481a05ad0d386e384b61e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>