Merge "Fix mediaserver crash issue" am: 518ccbc529 am: 2f6c0e514c

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

Change-Id: I1ad1d91ca141044377ecd879f7f31650e1438316