Annotate symbols correctly am: e6e6bee183 am: c3dad2e7b2

Original change: https://android-review.googlesource.com/c/platform/art/+/2229029

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