Merge "AVRCP MediaBrowserService support ACTION_PREPARE"
am: a2528571ff

Change-Id: I718593686d22267226ff11892a86a88024295ebc