Merge "Only allow AM to update display orientation based on app containers" into oc-dev am: 9304756c28
am: 4f49a5c7ba

Change-Id: Ib8f96663e4a667385ad0891616789403d14720f5