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: b8d185f2
Change-Id: I6021c2855cff18b56f3b8b5d653729375d056350