[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0098fb02bd -s ours am: 92d42df158 -s ours

am skip reason: Merged-In I00d0a613a8a906ca90bb20d0bef553d4beb64373 with SHA-1 3d6710c5e3 is already in history

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

Change-Id: Ide529bc7832d5bdd86c8eddd0af075d1ec88c652