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

[automerger skipped] Merge "RESTRICT AUTOMERGE [PM] Fix the profile issue in UninstallerActivity" into udc-dev am: 876e3017 am: ee6751d6 -s ours

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

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



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