Merge "Move QS cell indicator back into mobile data tile" into oc-dev
am: a5b457b3bf

Change-Id: I09bcb45a8931b8fedae967b1d88ab594164a9dc7