Merge branch 'master' into HEAD am: db9e639a87

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

Change-Id: Id9ab6d53a920356f78d240c02d466c752ec8516a