Merge "Remove error thrown when running rm <file> for a nonexistent file" into main am: 580c8c0c38

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3387461

Change-Id: Ia9d33e2ee9058dc3e095c947f312b788f5d299e0
Signed-off-by: Automerger Merge Worker <[email protected]>