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

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

Change-Id: I98a87a6dff692b2936193d0ff519edf2058de883