Merge "Add ACTION_STOP as a default player supported action" am: 90bcf3ce4b
am: df31a789d5

Change-Id: I51ad74ce5ba79f886e5cc472e3ad0046daedb782