[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 85722738b9 -s ours
am skip reason: subject contains skip directive

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