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

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

Change-Id: I2213922e583694cbc77885e6b7e931c34f64a6de