Merge "Fix RefBase Explicit destruction" am: c0f1cc2aba am: dab9500ddf

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

Change-Id: Ifb26ded2ee4fdb66653c3b4d8cac341c6139d710