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

[automerger skipped] [DO NOT MERGE] Ambient music - Update for favoriting intent am: 182349e8 am: f241d357 -s ours am: 32399b2f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0ff327473ac50b5c6d3b58c3fdbf2c78c56a4656