[automerger skipped] servicemanager: set consistent flags for self-reg am:...

[automerger skipped] servicemanager: set consistent flags for self-reg am: 6c86b6c9 am: c5a9cce1 am: d96c1ca1 am: db00dfa5 am: f7f924b1 am: 0880304b am: 0b7e0de6 -s ours

am skip reason: Merged-In I0fb567cbcca67a2fc6c088f652c8af570b8d7e53 with SHA-1 90b14eab is already in history

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



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