[automerger skipped] Fix DoubleBraceInitialization errorprone issues am: 2671eebc66 -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: Ib58c508c763e33a9c892ee5d4ec440c10dcfa2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>