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

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