Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 24abb535ed

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

Change-Id: I5c69534e1d9bfaadee0f3f2c8ae890360fe9dc9e