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

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

Change-Id: I12a22fa5adc1bf24870d4bc3c69f414bff7f2f51