Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-mainline-prod am: f6c1d6f7 am: 80b8dfff

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



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