Merge changes from topic "hds_identity" into udc-dev am: 8fc7d8d1 am: 75678385 am: 4c0a99e6

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



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