Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2
am: c54aa0c3f7

* commit 'c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
  MediaPlayer: Disable acquiring wakelocks based on property.