[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e2eb1e1b -s ours am: f673ed26 -s ours am: 0b0c3454 -s ours am: ab1b97a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6b8308b4ec00a28fef3b9c3e01e6cf5e2396b268