Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"