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

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

Change-Id: Ic04f1043acce41e5639db00d18bdeb000a75be9d