Android O MR1 IOT Release 1.0.4 (4973263)
Merge Android Pie into master

Bug: 112104996
Change-Id: I7f86f50ff9a100921c2a1afe34b12b8cc1304e9f