[automerger skipped] servicemanager: set consistent flags for self-reg am: 6c86b6c am: c5a9cce am: d96c1ca am: db00dfa am: f121539 am: 0c92179 -s ours am: ef1eb4c -s ours

am skip reason: Merged-In I0fb567cbcca67a2fc6c088f652c8af570b8d7e53 with SHA-1 6c86b6c is already in history

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

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

Author: Steven Moreland