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: a78c81b0 am: 1793db8c

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



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