[automerger skipped] [conflict] Allow dumpstate prop to R vendor's allowlist am: a8e1303bdb am: f28026f329 am: cb1ca01e1d -s ours

am skip reason: skipped by user inseob

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

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