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

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



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