Change upstream repository am: 43c98fb62d am: 5cc704d676

Original change: https://android-review.googlesource.com/c/platform/external/libcap/+/2724314

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