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

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