Make sure aodInterrupts are cancelled am: b681e2f5a8 am: 142812d152

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20670987

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