Merge Android Pie into master am: eb2a1bb9f3 am: 2dd2cfad1a am: fdf4762cbc
am: 85b2efe85f

Change-Id: Id9ecf669e6bde35da77ac5103d8f93cac1ae5a24
tree: 6abe6701a25898b173e9685ce6fe624e37b87514
  1. msm8998/
  2. Android.mk