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

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

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