Merge "remove obsolete dumpstate entries" am: b612b8f043 am: 142c5adf77 am: 92d97e1985

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

Change-Id: I080a20d6d0e0201e4e3e9d26aa6b5ebeb63f7c51