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

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

Change-Id: I8a713c284969ac77d45d210746ae17475172e663