[conflict] Allow dumpstate prop to R vendor's allowlist am: a8e1303bdb am: f28026f329

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2097397

Change-Id: I919975b560c3fecbb85e9c419f252779023c83d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>