[automerger skipped] Fix NPE caused by a race condition am: f2dc4205bd -s ours am skip reason: Merged-In I5ce544087cd9d61d684ce4aaddc3222708676ca1 with SHA-1 8bffd51141 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24264743 Change-Id: Ida90283cb9143bf49d5af944152d0731cda6b16b Signed-off-by: Automerger Merge Worker <[email protected]>