am 959afe0..abcbce4 from mirror-m-wireless-internal-release

abcbce4 Fix deadlock around locking in AudioManager
5a1b1fd Merge "Add more capabilities to TestVideoProvider" into m-wireless-dev
e09b47b Add more capabilities to TestVideoProvider

Change-Id: I00a8a3bebd56a5f78b6b3fa3958d6cf3929b1834