[automerger skipped] Merge "Fix wrong order of arguments" into main am: f71100913c am: c3fb1be7b3 am: 605d0e68f2 -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: I566cccb755a5c486bf48b5883348d637f3e8670b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>