Merge "Fix flakiness of testTransferLaunchCookie" am: c2cd376f6f am: c51eb6a40e am: 6507326db9 am: 52d46f6f3d am: 3fd88083cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884198

Change-Id: I4819451aa485bfbe23bcb6278f7eb2ceda0f091f