Merge "Start consumer_ir service only when supported" into udc-dev am: cf4b894d am: a4d01ca5

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



Change-Id: Ic45a2606c42d2c84e6eee0a68cdc7b44567dce60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>