Merge "Fix race condition when removing auto-summaries" into tm-dev am: e6289981

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



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