Merge "Handle timeouts while dozing" into tm-dev am: 862611a5 am: 88bb00cc...

Merge "Handle timeouts while dozing" into tm-dev am: 862611a5 am: 88bb00cc am: 1d81239e am: 1f5fb529

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



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