Merge Android Pie into master

Bug: 112104996
Change-Id: I75c47ad731d384a75130ecfffa4ebf6b50b66899