resolve merge conflicts of d3311c00 to master

Test: mmm system/sepolicy
Change-Id: I5729c636f6d3b361dc902375ee6410cf137fc9ad

public/dumpstate.te

@@ -95,6 +95,7 @@ binder_call(dumpstate, binderservicedomain)
 binder_call(dumpstate, { appdomain netd wificond })
 
 hal_client_domain(dumpstate, hal_dumpstate)
+hal_client_domain(dumpstate, hal_graphics_allocator)
 # Vibrate the device after we are done collecting the bugreport
 hal_client_domain(dumpstate, hal_vibrator)
 # For passthrough mode: