Merge Android Pie into master

Bug: 112104996
Change-Id: Id03acfe008a6ba5b752b2a4babc17d13febdb57f