tree c2489c0a5aa548db47c9bd263aaa13cf9568c81e
parent 3fe84f27ed18db1ab863ff9b282a13596ecdc674
parent 51751f933674ccb015331f507f3f15d63fa63945
author Matt Pietal <mpietal@google.com> 1698866869 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1698866869 +0000

Merge changes from topic "revert-25238254-revert-25203598-JSTZLIMFAD-OSCLKJEMQG" into main

* changes:
  Revert "Revert "NSSL Migration - Animate top padding on shade pu..."
  Revert^2 "Burn in - Don't allow it to enter top inset"