Merge "[Bugfix]Switch back to the application on /system when UID and path changed" am: 2d62797e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2319751



Change-Id: I4fa6d5f32974887fbc90d5be9f78064c9960cec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>