Merge "Check permission to add accessor in servicemanager" into main am: bbc53bc0d4 am: 18b15cce78

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

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