Merge "Fix for race condition when clearing compaction list" into tm-dev am: 11a44a2c am: f9653bf9

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

Change-Id: Ia7701e8f1014ee7f9db2c89cb94866f1f9c1b91d