Merge "Fix appMetadataFilePath when restoring system app" into udc-dev am: 2c1d1981

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



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