am bfca689b: Merge "Fix Music apk force close issue during monkey test"

* commit 'bfca689bb6605cfcd1e0c1781c707735efb7444e':
  Fix Music apk force close issue during monkey test