Merge "Fix duplicate divider for settings button preference on v31." into sc-dev am: 274a1a7c78 am: 426e8ae227

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14722507

Change-Id: Iecb4ce1973cbe6f28e46be0def9e83550543119b