Merge Android Pie into master

Bug: 112104996
Change-Id: I61cbe214eb141b9105325b3400a3bd0a9dcf02de