Merge "libdatasource: fix null dereference" am: 0aef3ff448 am: 77f55e21af am: 084f176d87

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

Change-Id: I4164ec0abe0c827d8a8fda1f8db46519399ea484