Merge "Exclude timed power entities due to timeout mechanism" into tm-dev am:...

Merge "Exclude timed power entities due to timeout mechanism" into tm-dev am: 217f6cce am: 888a6a42 am: 8f3632ab

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



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