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

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

Change-Id: Ib42e4a2dfb38decb3a24543e24b61632aa0c6511