Merge "servicemanager: vintf declared API" am: 8fd083ca55 am: a57fdf911b am: 212edd6901 am: b23efff6bf

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

Change-Id: I4a9c3ac5aab3d67b34beea0126d283499d028ff9