[automerger skipped] Merge "Check window token when extending timeout" am:...

[automerger skipped] Merge "Check window token when extending timeout" am: bbb7268d am: e8bcf6a4 am: fa8736c2 am: 1652fc33 -s ours

am skip reason: Change-Id I656315eda001f1fff31cd265eadce5397606b855 with SHA-1 a72accd8 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1468548

Change-Id: I0049db40902a165de6fd5ed68ec0299422546876