Merge "Media - Don't clear unless active flag is false" into rvc-qpr-dev am: c231992ac3

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

Change-Id: I988eed44cd3f5f92604c627a212850142de016ec