Merge "Fixed the race condition for data unthrottling am: bf15dd96 am: b23a7f8b" into sc-v2-dev-plus-aosp am: 532b3cbb

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

Change-Id: If3bf3ebdd630ba32d6b77a4c1599d7ecf3c49887