Merge "Fix flakiness of testTransferLaunchCookie" am: c2cd376f6f am: c51eb6a40e

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

Change-Id: Ib606412bdbf77c8b93e574a536000377deb0aeda