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

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

Change-Id: Id14f6ba6bdabd3f2d011c1973826e507a58eefad