am c3504304: am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.

* commit 'c350430490cce6b54a5c38f91e8a12d245332c18':
  DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.