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

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

Change-Id: I1b49a1ab2c3b93f28b14780cbcfb12d40e390087