Merge "Fix duplicate divider for settings button preference on v31." into sc-dev am: 274a1a7c78 am: 628b9c000d am: 09a209b76a

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

Change-Id: I050a775692f4047e0f128853dba813415a2ccb71