Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev'

... to cherry-pick aosp/1252358 into rvc-dev for gralloc 4
changes.

Bug: b/146515640
Test: m && launch_cvd
Change-Id: I09be0f84945557878ffdf56b2579dba2879d1b50