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

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

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