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

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

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