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

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

Change-Id: I40c8507abc88c48d48031f2b97ba852a4ff7a3a0