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

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

Change-Id: I91f4cd6fb344b85e7d5bc3c5bf65817b56b77aba