Android mainline 11.0.0 release 19
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: b1e077dd00 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib8e9b9f17cfcb0702719a8d4afc196575af430ed
tree: 2d57e9e87d4df17237a91eca2b6b97fe6f7ca0c0
  1. Android.mk
  2. power.c