Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am:...

Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d37 am: efa5a0e5

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

Change-Id: I55bcfc699e0891426421b56397a6a48f517b6e9f