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

[automerger skipped] Merge "RESTRICT AUTOMERGE [PM] Fix the profile issue in UninstallerActivity" into tm-dev am: cc0c1edc am: 501bc3cd am: 3b053634 -s ours am: 2e2e42f3 -s ours

am skip reason: contains skip directive

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



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