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

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

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