Merge Android Pie into master

Bug: 112104996
Change-Id: I97f1f4d2aa12efd5439a9f251e6d6b3207402acd