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

Bug: 112104996
Change-Id: I4ab67e82b596008eabe205e81013008f955c51c1