[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: ddf7d14ddd am: afca9f7acc am: 598eec7557 -s ours am: 189fb07187 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I31eef1fd384618efea2c3a09b5ba6d815e141d2e