Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
am: 4ba6f99070

Change-Id: Iefbb9bd3c578fe8d8662f7d35422f6f20b8110a1