Merge Android Pie into master

Bug: 112104996
Change-Id: Ic81f0a006d7f95c43cd0245405daacfc11cd4bc9