[automerger skipped] Merge "Fix wrong order of arguments" into main am: f71100913c am: 35226b9268 am: 4256ba1046 -s ours

am skip reason: Merged-In I284eef8c35f503f03999dff5afa910fbc53b3b1b with SHA-1 0f245abca1 is already in history

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

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