Merge "Update BufferQueue owners" am: 794dc13775 am: c2a36a59c2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1350602

Change-Id: I1d1a447a5136f7846990a214fe32d29d83557462