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

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

Change-Id: Ia724ce769e036348a35d2166dc9fa0a5bb32ab8a