Merge "Fix data migration after appId change" am: d17ebebe81

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

Change-Id: I5d02aff11459bce1a6780a0fee2b1e918cb3401a