Media - Remove before adding for config changes am: bcf5c853d5

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

Change-Id: I2828ee94629e68953bce24fd954d3d408f1090da