Merge cherrypicks of [17939448] into sc-qpr3-release. am: 82da157397

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

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