Merge "Do not rely on android_is_in_vendor_process" into main am: aa627355e4

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

Change-Id: I25a837d3f8dfbf86736759c23f09ac70d5323750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>