Merge "Fix persistent dot not removed due to race condition in scheduler" into udc-dev am: 31a8777cbc

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

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