Merge "Fix wrong order of arguments" into main am: f71100913c

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

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