[automerger skipped] Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 48961ad766 -s ours

am skip reason: Merged-In I45cf318778dbc8820a41237afefc4a6ee650b5a1 with SHA-1 165f646b3f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3214088

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