Merge "Improve robustness when migrating from appops xml" into main am: c1b1e8a5

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



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