Merge "PREUPLOAD.cfg: include servicemanager format" am: bf5af5bfd8 am: 277575473d am: f270622e3d

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

Change-Id: I123f3c6cd7808995753a34075426eeaa392847c6