Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7

Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I951a70c12cc16ad0827b0b2019d86522f6ff60cf