Merge "Re-enable swipe up view inflation test." into sc-dev am: 93e232a57b am: 50625a70a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14848883

Change-Id: Ic57433d70f872f8814f6174cdee5726230ad19c5