Merge Android Pie into master

Bug: 112104996
Change-Id: I246554b8e53b0ab33d9cf32cf747cab5e9cdf2da