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

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



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