[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-qpr1-dev am: 810d69ce -s ours am: 4ba123d8 -s ours am: db652ba0 -s ours am: 2236f217 -s ours am: 3457c681 -s ours

am skip reason: contains skip directive

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



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