Android n-iot-release-smart-display (NIT1.180611.004)
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 62a6bab8dd
am: 6ec1d91c77

Change-Id: I26f65e0098dba3d64257ebecab643528e0eb7e76