Merge remote-tracking branch 'aosp/master' into aosp-update am: 2611e2d8d2

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

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