tree b5716a9049e653fb785130ab556a0458e71d81fd
parent 1ac89155ebcb3b32eb00c41f837d6403a6daad6b
parent 0e4888403782e4c62a91fd363e1e437630709739
author Daniel Bright <dbright@google.com> 1615672412 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615672412 +0000

[automerger skipped] Merge "Point to new Radio Hal Capability Controller" am: f98c2fa547 am: d86e4105c0 am: 0e48884037 -s ours

am skip reason: Change-Id Ib4971d7feab891c2a4bbabda4528cdadb85f530b with SHA-1 94f4366c69 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1634000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie62b5bc44fc97fa70be4f674b1cc8e398ddb030e