refs/heads/android12L-security-release - platform/frameworks/opt/telephony

commit: b4309671e5c267641f5d851ed219590d74522413
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri May 13 20:37:57 2022 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri May 13 20:37:57 2022 +0000
tree: feb8b0e2fcb03f49d7cd0bb16efa5c070fd1078f
parent: a95af1db865125f8699214f886a1cf4d430966e9 [diff]
parent: 27b8c20ade5a208b27d53111ebfe866b118d6881 [diff]

Merge cherrypicks of [18167896] into security-aosp-sc-v2-release.

Change-Id: Ie2a3739cad00d623afcff7b7b293dcea0c907005

tree: feb8b0e2fcb03f49d7cd0bb16efa5c070fd1078f