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

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