Merge "Allow hidl adapters to be stopped with a property." am: 0431000d46
am: a0393db41b

Change-Id: Ifec18c42b0784a68e90913fe6637c18baa5aaf6b