Merge Android Pie into master

Bug: 112104996
Change-Id: I4e2b80af0f9a7accfd88ef6394a0fb42e2f0b6be