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