Merge Android Pie into master

Bug: 112104996
Change-Id: I613426d8e40fc15798684dd86ecaffc261f41bd0