Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into...

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

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



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