Merge "Fix flaky jank test: Swipe Expanded Card am: 680844d6 am: 5204a8e3" into nyc-mr2-dev-plus-aosp am: eb6fbe89 Change-Id: I8e1abd2e674d2d98738b48e096b6f3c2e5577926