Merge cherrypicks of [19732535, 20029210, 20090506, 20090507, 20090508] into tm-qpr1-release. am: c6957566e2

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

Change-Id: I509271f0727b4efe79e12b696a9b719c2bb5da3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>