Merge changes from topic "ms65-identity" am: 3e389629aa am: af3d521d82 am: 2e39612bb2 am: 7b7fcd3e2b

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

Change-Id: Ib449635e1b121fde7c97f0d668b6f9ce92d8c3eb