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

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

Change-Id: I579babd10d10929248c36a4e3e867a2008fde413