Merge "Make auto-rotate pref not reset on upgrade" into pi-dev
am: b5dac6f63a

Change-Id: Ib391b9e4374d67a4701c982ac4e0b0ec0169780d