Merge "Update the logic to force cleanup all edit monitor instances." into...

Merge "Update the logic to force cleanup all edit monitor instances." into main am: 96c15d81 am: 3a91b52e

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



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