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

Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: 4298f0a0 am: 8f7da207

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1692287

Change-Id: Ifd133904b2f5ee75b01959c0bf4b3e04b99f5214