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

Change-Id: I9ae7c566818a0eed0b23d45b3c30fc0154337f2a