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

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

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