Merge "Fix mediaserver crash issue" am: 518ccbc529

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1913455

Change-Id: I9b8938ac2c18c1c5804418f437a08999ab2ec265