Merge "Use new AIDL IR interface for ConsumerIr service" am: a188a10262 am: 26af7dd375 am: 8522a80d4c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1887097

Change-Id: I9c43e89df4942274054d28d0ac9d31ceaffe09cc