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

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

Change-Id: Iec75a07eb5a167d879148ea75cd5a62c44b481dd