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

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

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