Merge changes from topic "hds_identity" into udc-dev am: 8fc7d8d1 am:...

Merge changes from topic "hds_identity" into udc-dev am: 8fc7d8d1 am: adfc0205 am: a5432727 am: 9852be5c

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



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