Fix cutout disappeared when rotation

The previous CL[1] add a new parameter fromClient, which conflicts
with the original constructor with parameter RoundedCornerOverlay.
This CL fixes this issue and also make WindowToken ctr in
addWindowTokenWithOption take this parameter.

[1]: I871bd78a21dbde1286786e65c340b6259b873660

Test: atest WindowContextTests
Test: atest WindowTokenTests#testWindowTokenConstructorSanity
Test: manual - reproducible steps mentioned in bugs
fixes: 150576746

Change-Id: I023068f9536ff56259c8f2347546a1282ab2c268