Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
am: a8abb9d586

Change-Id: I7ae1b22a70a73d761dc4cea6c6892100261394af