Merge "Add consumerir HIDL default implementation" am: ac430dba09
am: e09bb06994

Change-Id: Iee3e4e60e03b58be2929413a69ec151f1048b1b5