Merge "Merge "Revert "Use configuration delta to determine if still in...
Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec" into oc-dr1-dev-plus-aosp
am: f59b28ac
Change-Id: Ice5849dcc7eb95ca473ca9f00764e06fde4bd65a