Android O MR1 IOT Release 1.0.12 (5501548)
DO NOT MERGE - Skip PPRL.190305.001 into master

Bug: 127812889
Change-Id: I104fececfee343f5fc1a2e33a59cf82bb6407ef9