[automerger skipped] DO NOT MERGE Local timeout should cancel remote work am: 2d6bcbec am: a3d2c48d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I985a0568fc99899775e63a9a2e17750456983665