Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into...

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

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



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