[automerger skipped] Merge "[DO NOT MERGE] Ambient music - Update for favoriting intent" into sc-qpr1-dev am: d80e2a7cac am: 97c243be29 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854031 Change-Id: I80e1095ea650e8153eafd87ad797e2394977c794
This commit is contained in: