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

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

Change-Id: I5b29aa9132b0ce2b45cdd0d6e7ad749b3e8ea3b7