Merge "Merge "Fix flaky jank test: Swipe Expanded Card" into cw-f-dev am: 03b7073c am: 70b2519f" into nyc-mr2-dev-plus-aosp