[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am: 32c8849b -s ours

am skip reason: Merged-In I322a4ca6630e9c07aa072790e1e345bb1532d2b3 with SHA-1 96932fec is already in history

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

Change-Id: I2984b6eb331b919ac8a89498ee7c4a8fd61808a5