Android O MR1 IOT Release Smart Display r9 (OIM6.190107.030.A1)
Merge tag 'v25' into HEAD

kmod 25

Change-Id: I85ca3d431e98fea79526573a9862869a65c85118