[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am: 1b00213918 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e11426f13323141cdb7a020cbb8910210b2b2c8
tree: 677dc496b7ae950e7aa60a5d37f02337b4741b2d
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE