Merge "Show the icons in QS/SB as long as the default is default" into sc-dev am: c09eeb3a am: fb1031c8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053408

Change-Id: Iaeec35f87b05e98660be39c326359dfd585c8708