[automerger skipped] Merge "DO NOT MERGE: Add radio state condition for high...

[automerger skipped] Merge "DO NOT MERGE: Add radio state condition for high power indications" am: e4b65f09 -s ours am: 285d2aa4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icf977b4a59063b4cda4fd79a8c204d42bc063b5c