Merge "Check window token when extending timeout" am: bbb7268d06 am: e8bcf6a40a am: fa8736c237

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

Change-Id: Ia0424417dab79f477c5bdeef8595854350db45c0