Merge "Support delete" am: d50ebda005 am: 176525b3d4 am: 8b6f72ac33

Original change: https://android-review.googlesource.com/c/platform/development/+/2545512

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