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

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



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