am 3324d834: am 7604b23c: am 9bf62048: am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev

* commit '3324d834c7fc4883f116aef99d12218971d8b739':