[automerger skipped] Merge changes from topics "unthrottle_apm",...

[automerger skipped] Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d37 am: efa5a0e5 am: 259fa826 -s ours am: a8559261 -s ours am: 26f2bf83 -s ours

am skip reason: Merged-In I1a7e413015ccdff3d9358cc85605325a4bff3b33 with SHA-1 c8cf1b02 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851

Change-Id: Idb6098abdb0d6d4b51557dd69f7000d47909980e