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

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d306 am: 6fa03745 -s ours am: 0e9238a6 -s ours am: 8b6d7ebe -s ours am: f422d1ae -s ours am: 535d0075 -s ours am: 00256bae -s ours
  [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f267 am: 2246ebbd -s ours am: 38d3bfcc -s ours am: f75baf4e -s ours am: d28149e4 -s ours am: fc0da5eb -s ours am: 1ded440d -s ours