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

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

Change-Id: I81863c5db63eb3511fe905851734ab6faaf2fde6