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

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

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



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