Merge changes from topic "am-baa68264200d4616baa454f231e54eef" into tm-d1-dev-plus-aosp

* changes:
  Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf5 am: 5d508272 am: 30285d92 am: 68030462
  [automerger skipped] [automerge] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 2p: 24473590 am: ecee7cb0 -s ours am: 4ec2b1ec -s ours am: 95e4b3d4 -s ours am: 75e51b4e -s ours