[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 2e0681f0 am: 7889912a -s ours am: fac2efb6 -s ours am: 05774757 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I531a35e6b475f7126c3b4a8cafea1eb83e641d9c