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

[automerger skipped] Merge "[DO NOT MERGE] Ambient music - Update for favoriting intent" into sc-v2-dev am: f247750d am: e63982ab -s ours

am skip reason: subject contains skip directive

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

Change-Id: I295f7938b06d3b716b897d62c39ea4495a1bc987