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

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



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