Merge "Cancel AodTimeoutAction when display is unconfigured." into tm-qpr-dev am: 7e64429d94 am: acaa100dd8

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

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