Merge "Make edit monitor error type clearer" into main am: bd73f66405

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

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