Minor refactorings in api.go am: fd31645f85 am: 611021d067 am: eb994c7dae

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

Change-Id: I68468b310094120ba9052628b256bfac7784f7d0