DO NOT MERGE Local timeout should cancel remote work am: 2d6bcbecd3

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

Change-Id: Iea14f8080a72234fd9997bbb8cf16b7df5f4e86b