Merge \\"Fix TaskswitchingDeviceTest.\\" into marshmallow-cts-dev am: 65540be075
am: ba34b453e3

Change-Id: I1351f474e2b6f532ca7584740cf6308c5be16961