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

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

Change-Id: I9f23eea029a8640fe12177c2a5575dd18163b201