Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf am: 0a993da2bf" into oc-dr1-dev-plus-aosp