[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-dev am: cc2adc0e -s ours

am skip reason: Merged-In Id4eb5484563fdec530d5fc89a2c5973c351fdab8 with SHA-1 55e0d4b6 is already in history

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



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