tree 16022a61077ef4fb619d89f5240d7a2bc0077f9d
parent 4577ca6756ba9fdf7c02a8849bf67376148dc5ac
parent f28026f3299a9372f6d332cae0dbdc710ca11a0c
author Inseob Kim <inseob@google.com> 1652407517 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1652407517 +0000

[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>