[automerger skipped] Enabling testing with swipe-up gesture on Pixel2 devices am: 049738e8 am: 9882cf3b am: 44e9bc4a -s ours Change-Id: I701fae79582f0af11d44d38677ecdf9fddcb128d