[automerger skipped] Merge "Make homepage search bar remain persistent when...

[automerger skipped] Merge "Make homepage search bar remain persistent when scrolling" into tm-dev am: c0c6944e am: 1805277c -s ours

am skip reason: Merged-In Ice88c1bb324780e72332dd810e654b1d17daafae with SHA-1 bcfd5b3d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033477

Change-Id: Ia2bcc7263eeb6204759e99610084bdcc698310ff