[automerger skipped] Merge "Remove dividers of TopIntroPreference" into sc-dev am: 3c865b12 -s ours

am skip reason: Merged-In I601e87e8f20e25fde3197674f9503ab9dff292a0 with SHA-1 b7f3cde5 is already in history

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

Change-Id: I2af338a99a58a3abeae64a84eed2a8f38b341c97