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

Change-Id: I4c3c440a53ba8385aabaad3c705a23672ea801cf