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

Change-Id: Idbfd4664ae7b45990771ab13763ae587798f1679