Bug: 192520231 Test: manual test on taller devices Change-Id: I3eccada67f0ba07d01f823c4156f02c3feb97f84