Merge changes from topic "am-416f80ef74bc451099b70db43b007382" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d -s ours am: 7720f2f1 -s ours am: 1e13559d -s ours am: 6e59af39 -s ours
  [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 006bb710 -s ours am: bf859869 -s ours am: f4f56527 -s ours am: a8e2d1c3 -s ours