Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 am: e00fbbe6c4 am: ecccd3de1e am: 906d4d2c1f

Change-Id: Ie01960a15f0134abc4e02a73ba5cf629d930ccd5