Merge "Re-enable swipe up view inflation test." into sc-dev am: 93e232a57b am: 52434c6ec9 am: 2e0c642595

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

Change-Id: I902bc9722051cdf6eec903c05f0a4483ed68c4f6