Merge "servicemanager: remove TODO to combine sid checks" am: a427126e21

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

Change-Id: I87b35b62a1232218fe75096332980dcb98e973c2