Merge "Remove rotation flag check am: 2b515c7058 am: 158cbbfeab am: fab05d953f" into rvc-qpr-dev-plus-aosp