Merge "Use new AIDL IR interface for ConsumerIr service" am: a188a10262

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

Change-Id: I2502957b5f4fe1ff2a3e5e3a601b57850d1e8495