Merge "Fix quick settings tooltip changed when color correction fab clicked"...

Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef917814

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712



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