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

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727dadd am: 806167ed -s ours am: 886fab19 -s ours am: 3d7a421a -s ours am: 52111570 -s ours am: 4faaa465 -s ours am: c8ac3211 -s ours am: 50f3802f -s ours am: 6ecbfd54 -s ours
  [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a am: cd6e9585 -s ours am: 0de1dbc4 -s ours am: 83ca24a0 -s ours am: 92bc9275 -s ours am: 1a1e56a0 -s ours am: e3e7ddd8 -s ours am: 0d5d3650 -s ours am: 9a605f0f -s ours