Merge "Annotate symbols correctly" am: b2d8315f10

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229031

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