Merge "Add android.hardware.consumerir@1.0 service."
am: 3bee82f5d7

Change-Id: Ic073c5e68c57ea0aecf64f7d2f032bdefcc73c61