Merge "Fix wrong order of arguments" into main am: f7110091 am: 35226b92

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



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