Merge Android Pie into master

Bug: 112104996
Change-Id: I77187d40d11622ca6b9d2e2cb23d11db90305837