[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: a606d075f7 -s ours am: fb9deff4e6 -s ours

am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history

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

Change-Id: I4db9908cb12ea510755070b90893af99324e0971