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

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

Change-Id: I4fc866cdacc594c3f1e3e9499becd8d72bd78678