Merge Android Pie into master

Bug: 112104996
Change-Id: Icf38c8d11828f219c862aed4dbc35e5fddf716f5
tree: e1fe1fd4923a746245ef92a5113e336ecbf44ee3
  1. tests/