Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into...

Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf5 am: 5d508272 am: 30285d92 am: 68030462 am: 16e2da45 am: e55508f5

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



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