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

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



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