Merge changes from topic "ms65-identity" am: 6dcaf9dee4

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

Change-Id: I9f23eea029a8640fe12177c2a5575dd18163b201
tree: 8bb5a077508fb7ce0c9ae119e7efdaa64a7346ce
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/