Merge "Revert "Only allow AM to update display orientation based on app containers"" into oc-dev
am: 91f241b35c

Change-Id: I7b9c3737840bce70ca2532fc0b445141407b8d90