Merge "servicemanager: vintf declared API" am: 8fd083ca55

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1435031

Change-Id: I5df0b2a84148778ae436812bfa4d3c5a423f848d