Merge "Merge Android Pie into master" am: 90a54e7375
am: acaffe609c

Change-Id: I1ccac006a68400ebbed9fadd6fb04001a6b4eb4f