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

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



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