Merge Android Pie into master

Bug: 112104996
Change-Id: I817944b20e6052a1527b0d9592cc52c776259121