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: I7710662d8f126314e11312cbda0a1809cb7344f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>