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: I1a1072e80eb2d4cf8db65f931cdd1e7a93470bb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: