[automerger skipped] Merge "Revert "Make Navbar Secondary Handle Appear Correctly"" into 24D1-dev am: cb533be77f -s ours

am skip reason: Merged-In I6da596b88bbc2cb7b6e24a18857555abfeb37e3e with SHA-1 28624873fa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26743585

Change-Id: I9fba68cc776538db0d0e7e5fbc916485d72f96b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>