Merge "Remove dividers of ActionButtonsPreference" into sc-dev am: bf3a8b54de

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

Change-Id: I17346f9dde6a0649f41f241732c695a40c44758b