[automerger skipped] Merge Android R am: 0439a16f1a -s ours am: a688c90abf -s ours

am skip reason: Change-Id I13bd92e0dd2a3a4094a7c8e19097a88a94b147b2 with SHA-1 86f69a2687 is in history

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

Change-Id: I624ae6dd192cecf9f24b162fe1a1606272a7541c