[automerger skipped] Skip ab/6749736 in stage. am: e4ccac5919 -s ours am: d1377d4a33 -s ours

am skip reason: Change-Id If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580 with SHA-1 d2f5901ceb is in history

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

Change-Id: I8d089b6472194a35125f8fc30287b94e34e0c5c8