Merge Android Pie into master am: 8a744d061b am: 033dcaf9d7 am: b23c9b8653
am: 8f971bf075

Change-Id: I8d129ff0d0fa7206bfa97f9aa7d45d961579d370
tree: 8b3f6c35106d79e94827c391f62ad7e38e826ff9
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE