Merge "Reduce chance for leak in MediaPlayerData" into sc-dev am: 8e4f478f am: 2421f89f am: b2685b33

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110150

Change-Id: I545bce62dd926a92dc72267b30fbf75622ec2ffb