Merge "system_server: Add log for skipping registration of framework service" am: ddfa46368e am: bc629a9021 am: 0c3e933732 am: feb3834aaf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465810

Change-Id: I0be1e0ff302ce2ef5152c2d1c617e2c4594c6af0