[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 skip reason: subject contains skip directive

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

Change-Id: I84370e4cd58b52f0a5debbb38ec3bf19d4a3c42c