Minor refactorings in api.go am: fd31645f85

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

Change-Id: I5e735f2cb24a0af551bb69d211d483bc7f0ce8f5