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

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

Change-Id: I8f9abc63affe76f6438bff0d2c7fbb3d402ba76a