Merge changes from topic "am-07e58fb378f644e39029e33a7dd1fb68" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb -s ours am: c41f7141 -s ours am: 9b71aa5b -s ours am: 61633a44 -s ours
  [automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd5061 am: b7d6952d -s ours am: 2dac8d1d -s ours am: d80bf72c -s ours am: 7bf4b84e -s ours