Merge Android Pie into master
am: f2e1d21306

Change-Id: Id5eb977f5b7dd73e7b8b8ea3472612ceb0704a70
tree: daf7abb595add3ce148b4cdf118a21df2144cfe4
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml