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: caf42f2c

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



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