[automerger skipped] Merge "Remove dividers of TopIntroPreference" into sc-dev...

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

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

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

Change-Id: I4ced2668c39f16497ee644404df53c10d713d77e