DO NOT MERGE - Merge ab/7272582 am: 2f98b3b342

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

Change-Id: I65ed9d95a6cab7819ff69a5efa793e69ea6b6338