tree dc8e5cc07df5757f0bf32bec5007a7c8446d03a7
parent 334d2956ebf71fc518514f08ac2523fc51bee9a3
parent 76b892d0f0ea866bdc828ce0fa6c1091b563a49d
author Hui Wang <huiwang@google.com> 1614722040 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614722040 +0000

[automerger skipped] Merge "Notify rcs config as needed when RCS service ready, and support test mode" am: cb8481d9e6 am: eacddabbf1 am: 169c9f27b0 -s ours am: 76b892d0f0 -s ours

am skip reason: Change-Id Icef61a850c679334a8279f0e28e5110f867b75c1 with SHA-1 baaee6a06f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95fa3883c4bfc6e26f14cac45a27401f73ed73de