[automerger skipped] Merge "RESTRICT AUTOMERGE [PM] Fix the profile issue in...

[automerger skipped] Merge "RESTRICT AUTOMERGE [PM] Fix the profile issue in UninstallerActivity" into sc-v2-dev am: b17e0526 -s ours am: 4faa19ad -s ours am: 5a751bc5 -s ours am: cb292c58 -s ours

am skip reason: contains skip directive

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



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