Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf574 am: 5d50827274 am: 30285d92b4 am: 68030462eb

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

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