Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev am: 79f8944a5e am: 387ae000b1

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

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