[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: de47dba3 -s ours am: 45c1cd7e -s ours am: 456a2ecf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7eb9cb8f7ba2da93ad9b8968e33a2f7cfdb0c7da