Merge "Reset alpha of media when not fading" into sc-dev am: d3f247be am:...

Merge "Reset alpha of media when not fading" into sc-dev am: d3f247be am: a49c9165 am: fb5b2534

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

Change-Id: Ic6e01576340b0ce3c9605e101fb37e648648f52c