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: ecacd164 am: 436e2740

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



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