Merge "Ensure special Dalvik annotations are kept" into main am: 2674152f am: 2e2c2ab1

Original change: https://android-review.googlesource.com/c/platform/build/+/2737913



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