Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp
am: faf101f24c

Change-Id: I353d79ca06c15c0ef1ea7df6b3320097afbdc4cf