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

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

Change-Id: I20ee7d8d09b99dd33225a1fc409098eba52f69ad