Merge "Remove the active deletion action of callbacks" into main am: 2734d2f2bb am: 288f14e354

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2730951

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