Merge "update new HIDL interfaces in generic system image am: 4584215b am:...
Merge "update new HIDL interfaces in generic system image am: 4584215b am: 593767a7" into oc-mr1-dev-plus-aosp
am: 60936ded
Change-Id: Idf584bd869e65b82f102682fe80990e2f5338f0f