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

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

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