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

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

Change-Id: Ia5185de17670bc24b9e0ac07adfdda562a4799ba