Merge "Fix transition after restarting inactive media" into sc-dev am: 5b541728 am: 66738041

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

Change-Id: Icce09023c138ebacf9e913f6666de6a9096a57cc