Merge Android Pie into master

Bug: 112104996
Change-Id: I656c0ae0e8ee1a6207e55b48d3789dbe6c95a881