Merge "Program name adaptation for vndservice" am: e8ba9a1e11 am: 2d36063be7 am: dfa2e5d3da

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

Change-Id: I395dcb8353c5ead4a18573c06e8cdfee138f4356