DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on...
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3 am: 087d30c1
am: a6ed5dcd -s ours
* commit 'a6ed5dcd':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."