Merge "Support migrating app data to a new appId" am: afab1b0812 am: ada5816299 am: e5f7aaff28 am: 8c725e5d8f am: f22a5a5696

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1863257

Change-Id: If98ec0e28221463f44514afdfc05b97ee06400d8