Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev am: 79f8944a am: 010ce0cb am: 14ee54d3 am: fbf40002 am: b470c9df

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



Change-Id: Id99d846463e27612971e03982801a95d06b26f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>