Subclass in VINTF -> super class must be too am: d1ccb8f4ae am: 499c2fa50e am: 4e8f192498

Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/1607485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf0e342a9e9e9f692c9ee463ee14cb028fa4a399