Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37