Merge "Annotate symbols correctly" am: b2d8315f10 am: 1ded786966

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

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