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

Change-Id: Iaa2b8191083eb61cb68d4d206e81eac27477380c