[automerger skipped] Minor refactorings in api.go am: fd31645f85 am: 611021d067 am: eb994c7dae am: da872251bc -s ours
am skip reason: Merged-In If0362c6dd90635831ac2cb2f7da336212f4c23fd with SHA-1 899766a79e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952382
Change-Id: I3715199cb0e1321dfacd23600b12561ab4662615
This commit is contained in: