Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev am:...

Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev am: cee2cdde am: 37de40f9 am: 2471acea

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

Change-Id: I4564d719f65918d33d97c18519f8e26309c625b2