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