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

Change-Id: I93134aaee5c7616fc7a08834f24a0bb438d3668f