Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am: 1fd7497f02

Change-Id: Ibc323f15a9a0bc6302ff105036964374c044b5e7