[automerger] Bringing back auto-rotate settings am: 40253329c5

Change-Id: Ic5b3039246827a209864ec2560046f11980500c4