[automerger skipped] Merge "Fixed the race condition for data unthrottling"...

[automerger skipped] Merge "Fixed the race condition for data unthrottling" am: cf84b272 am: 48686232 am: 157e2a98 -s ours am: 48385fdb -s ours

am skip reason: Merged-In Ia107f0c49fa293709eb30a27cf70a58e4f929ce0 with SHA-1 bf15dd96 is already in history

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

Change-Id: I8574d622746e85d5f0e652562115f66a875e6cb7