Fix NPE caused by a race condition am: 8bffd51141

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

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