Merge "Wait for data to be available before reading." into sc-dev am: 527d6d6a am: 1126a3a2

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

Change-Id: I3fea37b5579b50abdf5c09176720f072525b7e5d