Merge "Merge Android Pie into master" am: 5505e89bae
am: cc4f01353b

Change-Id: Ife64861a4d40afe09c86c5f19b61942982ee827b