Merge "Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev am: 3512953d27" into oc-mr1-dev-plus-aosp
am: e22c929e85

Change-Id: I38fa21c27e779ecdafb53124ce4c97e5d030ad7a