Merge "Use ProcessState::selfOrNull in ServiceManager APIs" into main am: d3e05e7fd1 am: 849c93e568

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

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