[automerger skipped] Minor refactorings in api.go am: fd31645f am: 611021d0 am: eb994c7d am: da872251 -s ours

am skip reason: Merged-In If0362c6dd90635831ac2cb2f7da336212f4c23fd with SHA-1 899766a7 is already in history

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

Change-Id: I3715199cb0e1321dfacd23600b12561ab4662615