Merge Android Pie into master

Bug: 112104996
Change-Id: I05f52927dd22cc8f6fa4827dbe7addb3839106a8