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

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

Change-Id: I6dcc4349e6fa145df9a8bd6b7cf1e99d49e6aa1a