Merge "Merge Android Pie into master" am: 2b2d7414c1
am: b16a54a401

Change-Id: Ieed202b41cb35610e1baecd5e4bf35e5cd1215d9