Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp
am: f59b28acd6

Change-Id: Iddc82041f907a406f74ba5bfc52c04068278c718