Merge "VTS: Test specifying --expect_upgrade {yes,no}" am: 434a0cc160 am: 9715eb7117

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2588687

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