Merge changes from topic "ms57-migrationapi" am: 159be51df6 am: c207cac6ad am: b32de77516

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

Change-Id: Iee5b56fbfa9007f3b60a07d1261f3afe04ef0674