Merge remote-tracking branch 'goog/mirror-aosp-master' into goog/sc-qpr1-dev am: e37c6dd2e0

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

Change-Id: I378f749f1df0c0ed6b8fecbd4033ce1a0b9cc286