Merge "Add genrules for merged system server stubs" am: f91d4e499c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieadaa858e9292bb936d50d5a66f344bcfad5298e