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

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

Change-Id: I4d3e51cc7c2c9ab4ae85a5e03839219b73df2525