[automerger skipped] Bypass build time check for users-libs am: b2af8e0a -s...

[automerger skipped] Bypass build time check for users-libs am: b2af8e0a -s ours am: e6c81942 -s ours

am skip reason: Merged-In I824345fdba8af9c641b86c423c882a0065b5289c with SHA-1 6b87d21a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/15276480

Change-Id: I098e6d522cc81e6aa41f77038d2c237e90649b37