Merge Android Pie into master

Bug: 112104996
Change-Id: Ia7e97e5696885e29ce702b0e684eacda9f8eec55