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: I94c80193a6e51effbb21fcb53d4126628f352172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>