Merge Android Pie into master

Bug: 112104996
Change-Id: I4f3879caac9ba9b4d4cc9038627c031ee16580bf