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

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

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