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 am: bf923273 am: 8b1f3b06

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



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