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

[automerger skipped] [DO NOT MERGE] Ambient music - Update for favoriting intent am: 18950dd7 am: 139aae81 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie2bd7d5ce906b3d08ab5f150a43102eb84c7958b