Merge Android Pie into master

Bug: 112104996
Change-Id: Ica10b7b55ca442e777ca0cf5011b13571c86cd0b