Merge changes from topic "ms57-migrationapi" am: 717c22831a am: 7b8b30b556

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

Change-Id: I935ec894b6ef8bbfaf0c52762f77e7ef43ba638b
tree: 544e905f389c57ef771822134c0bdeb7e43d3d0b
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/