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

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

Change-Id: Ia5a6e9c0b0e282b7417b2b06c35c25a4a88cb3c2