41e2824bfa
This reverts commit 361f82b237.
Reason for revert: Latest SUW update ensures AOSP layout is same as Pixel
Bug: 204384193
Change-Id: I4eaa8e6045232c2897d97e49d532939c838dbce0