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

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

Change-Id: Ia3ab6ab0a5f4a438f162c21d51ac00d7eba538bf