Merge "remove obsolete dumpstate entries" am: 2f7ee4b10b

Original change: https://android-review.googlesource.com/c/device/google/redfin-sepolicy/+/1675852

Change-Id: I889e4d93816f658e9edf6ad93ab438d8aab03c1a