Merge "Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev am: 5b76ce1b2b am: 84fa183e7d" into oc-mr1-dev-plus-aosp