Fix NPE caused by a race condition am: 8bffd51141 am: 7fc6be45a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24242049

Change-Id: I4af459d7a86f05a7d10af5ea72602d527fc302b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 6888b690e3534178a33f3fb9ca5740609a8395a9
  1. apex/