Merge remote-tracking branch 'goog/mirror-aosp-master' into merge am: 4c333dd763 am: c48949c14b

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

Change-Id: I2aba9b55db1577f6f77bca02b22638c62ff86aae