Merge "Fix parameter order." into sc-dev am: c2f4752a71

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

Change-Id: I954301b5c1dbb04210944523e2cbbfe93cb6949e