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

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

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