Include window type in relevant BadTokenExceptions

Bug: 23980921
Change-Id: Idb0f2d1fd0fd0c8525c6566c538c4cc6b5bb148b
1 file changed