[automerger skipped] Merge "[DO NOT MERGE] Ambient music - Update for...

[automerger skipped] Merge "[DO NOT MERGE] Ambient music - Update for favoriting intent" into sc-qpr1-dev am: d80e2a7c -s ours am: 8bfd093e -s ours am: c23f468b -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854031

Change-Id: Id5cab7cbee882c2c6abd4eb8e75af68f0e726d3b