Merge "Prevent NPE issues when removing media" into tm-qpr-dev am: 22530aa3 am: b934b50f

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



Change-Id: Ibe41bb76ba0421e97ca75b2f71ee68c5e03ae3eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>