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

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

Change-Id: Icb1fc2d33423e2ea900910f1517b5479f3628ccb