Merge "Improve robustness when migrating from appops xml" into main am: c1b1e8a505 am: 4685a424fd

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

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