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

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

Change-Id: Idc4f4462f8d801f6b7bdc736edfef828a561e34e