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

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

Change-Id: If8eda233edc2c3554faa8a50b49d92f6559844a6