Merge Android Pie into master

Bug: 112104996
Change-Id: Iab8120fdf331d25508df6cd11fb45c90ef72ceaa