Merge "Fixed testUrlBarChangeCancelSessionWhenServiceReturnsNullResponseVirtualContainerActivityTest." into pie-cts-dev am: 3b057aef2b am: d808a3d9f5 am: 840e17faf4
am: 28b922e1a3

Change-Id: I281d89abde95b19dad7240e38b2e407fef5b71d8