Merge changes from topic "ms65-identity" am: 3e389629aa am: af3d521d82

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

Change-Id: I84a75b2f5c4f0e9c4630ffe2a228fc11c10d7c22