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

Change-Id: Ie73e23e31865e2059a7ba3588d3b0fb809447000