Merge "external/boringssl: Cherry-pick bc0a4f1f0f7a2d56f944058da74b9c776ba38002" am: ff86bdb9ab

Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/1607475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cddd09be819ecfc47538842254ca88f82922e77