Merge branch 'master' into HEAD am: db9e639a87 am: 071c4df516 am: 4e2df6e874

Original change: https://android-review.googlesource.com/c/platform/external/gfxstream-protocols/+/1982869

Change-Id: Ieae420a115914420d959a95bc9928358bef997f0