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

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

Change-Id: I66282564491ae45ffa6da0c2a4e550156eb900ab