Unify the method signature

Bug: 383675486
Test: m cts-api-map-all dist

Change-Id: I859fb19fc39952225ccd16823462fffeadd12d46
4 files changed