[automerger skipped] Merge "Fix persistent dot not removed due to race...

[automerger skipped] Merge "Fix persistent dot not removed due to race condition in scheduler" into udc-dev am: 31a8777c am: 9d43da47 -s ours am: 108f373b -s ours

am skip reason: Merged-In I7380cb956b48c38bdd540b297287786cf35b94f2 with SHA-1 c86dbabd is already in history

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



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