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

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/13112599

Change-Id: I497b79c3890b8221742701ed28e2c53093c98af8