Merge "Fix DdmVmInternalTest" am: bb576ca60e am: 6e88695529 am: a7cd113251

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2062853

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