Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge "Merge Android Pie into master" am: d3aa3110a1
am: a4864ccb0e

Change-Id: I9dad8c26b7a6ec2a40417fd7ae7ae7a2897d3a58