Merge "Reset alpha of media when not fading" into sc-dev am: d3f247be am: 28199ebd am: 1555becc

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

Change-Id: If7a2db74ae69dcd69c5c3b62178e54fb9c718359