Bug: 239868630 Bug: 240116666 Test: testSearchDeadzoneForTablets passes Change-Id: I8b20cf56191058b6033ae929be6726a2c88825c8