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: 2db2bfd2 am: 53934205

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

Change-Id: I294000c177cfa4a4ccebb57402da031b4a0b00bc