Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev am: 0ac5228e54 am: aa8cf9bcfd

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

Change-Id: I5a4b1f2fe3736d6f1a9a5fcb1ca6b1a576296c81