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

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

Change-Id: I39ef92439dee2658a592f80b53a32ac8e3440ec1