[automerger skipped] Merge "Fix an issue with C-compatibility due to a missing...

[automerger skipped] Merge "Fix an issue with C-compatibility due to a missing tag name" am: 37b0d41f am: 28d3a432 -s ours am: 8ca32b12 -s ours

am skip reason: Change-Id I73b95ff1d6d17af512ce2226b6324e5da0343c39 with SHA-1 cd75355c is in history

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

Change-Id: I9b7920086b27c6549a4f834b5a8478eccb43f47f