Merge Android Pie into master

Bug: 112104996
Change-Id: I9894e8ea2aca7b32769e86fab52b7ee914fbb310