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

[automerger skipped] Merge changes from topics "setIconTint", "sync_update" am: c2b80123 am: 5939ba69 am: 2d1e7727 -s ours am: 0f3db9b6 -s ours am: ae436933 -s ours

am skip reason: Merged-In If6b3c99c35e4b06c6d6085abe5737583bfc8b665 with SHA-1 4fcc4906 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481030



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