Merge "Do not rely on android_is_in_vendor_process" into main am: aa627355...

Merge "Do not rely on android_is_in_vendor_process" into main am: aa627355 am: fac1a40e am: da7b9827

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



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