Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev am: 79f8944a am:...

Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev am: 79f8944a am: 387ae000 am: 55338634 am: 8c9881c1 am: 96e3a4e7

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



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