[automerger skipped] Merge "DO NOT MERGE Local timeout should cancel remote work" into rvc-qpr-dev am: bfd3ac4d58 am: 70a2b64da7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12686173 Change-Id: I08af7a84b1f975b7cdf649300840e10fbc01414b
This commit is contained in: