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

Change-Id: I81df798a1f2897837c6adbc622ffa64766030a6a