Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
am: 2ad5beb807

Change-Id: I02af0aa5ef03eff1ee25169011b63bd6b9e06d7e