Merge "Fix persistent dot not removed due to race condition in scheduler" into...

Merge "Fix persistent dot not removed due to race condition in scheduler" into udc-qpr-dev am: 1d2797f9 am: bd9f5df6

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



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