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

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

Change-Id: I38817fafaf14a09b6a4f46b988a31ae98e159ecc