Merge Android Pie into master

Bug: 112104996
Change-Id: I60cfa304a7ee4baeb2d0c47f91350af8410612ef