Merge "DO NOT MERGE - Merge ab/7272582" am: ddf7d14ddd

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1736003

Change-Id: Icc7b222094618bfa1f112ecfd3f84e80635b9dda