Merge changes from topics "setIconTint", "sync_update" am: c2b80123cf am: 5939ba6991

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

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