Merge "Merge "Fixed testUrlBarChangeCancelSessionWhenServiceReturnsNullResponseVirtualContainerActivityTest." into pie-cts-dev am: 3b057aef2b am: d808a3d9f5 am: 840e17faf4 am: 5bf6f55d35" into qt-r1-dev-plus-aosp