Merge "The order of paramenters is wrong." into main am: df028a7df4

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

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