Merge Android Pie into master

Bug: 112104996
Change-Id: I80533e40e18491cbd2973f76b0712f5c7adf45e4