Merge "Fix a race condition in edit monitor" into main am: 4cdd8ec8

Original change: https://android-review.googlesource.com/c/platform/build/+/3391128



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