Merge "Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am: 1fd7497f am: c71e7386" into oc-mr1-dev-plus-aosp