Merge "vndservicemanager requires vndservice" am: 959ba52f7c am: b71048aa7a am: be349a891d am: 898fae97ee

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

Change-Id: I78551fde0f0fd8cd7228b4fc323f31ac51a5f07e