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

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