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