Merge Android Pie into master am: f2e1d21306 am: 370c3703ef
am: e53cd14670

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