Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843

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

Change-Id: I5b364535808594161ae0aa7fe6d2eb75149fdd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>