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

[automerger skipped] Make homepage search bar remain persistent when scrolling am: bcfd5b3d -s ours

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

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

Change-Id: Ida06e34ce386fa371019742f8e6dbdd43292678a