[automerger skipped] Merge changes from topics "setIconTint", "sync_update"...

[automerger skipped] Merge changes from topics "setIconTint", "sync_update" am: dcfed6ee am: a3e281aa am: 95647e87 -s ours

am skip reason: Merged-In I35680bdd91af4fe492cd554ab327255c8d4709bd with SHA-1 2041b76d is already in history

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



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