Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I421ad141f2a1bbda2b2a2d7610aa8305b0ecd03a
Merged-In: Ie0eb4dfb17e3f64a9f375306a85d9eb58c8ab424
diff --git a/private/dumpstate.te b/private/dumpstate.te
index 5ea0d43..cfa05fc 100644
--- a/private/dumpstate.te
+++ b/private/dumpstate.te
@@ -53,3 +53,8 @@
 # For dumping dynamic partition information.
 set_prop(dumpstate, lpdumpd_prop)
 binder_call(dumpstate, lpdumpd)
+
+# For dumping device-mapper and snapshot information.
+allow dumpstate gsid_exec:file rx_file_perms;
+set_prop(dumpstate, ctl_gsid_prop)
+binder_call(dumpstate, gsid)