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

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

Change-Id: I93d9a5a4414aaff389dcf6683071c3f84ec83061