Merge "Fix mediaserver crash issue" am: 518ccbc529 am: 2f6c0e514c am: 5bd56e1946 am: 96df9327fa

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

Change-Id: I3d27f855a522ac1582161bb645beb61b1005ffa7