Merge "Mark ab/6881855 as merged" into stage-aosp-master am: df899e0d9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhwbinder/+/13113146

Change-Id: Id561af23c6d193df126cdeaf5875ddde7383a338