Android O MR1 IOT Release Smart Display r9 (OIM6.190107.030.A1)
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0