Merge "graphics: fix use-after-free in mapper 2.0 passthrough" am: 2d82c11b0f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1468882

Change-Id: If1e261b913564d29ca15c5426408668650cba02e