Merge "Transition to current state after icon timers expire" into tm-qpr-dev am: 92f5216f

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



Change-Id: I8748aadc944ae4d0648aa4babefa2dc80abc22f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>