[automerger skipped] Merge "Add genrules for merged system server stubs" into sc-dev am: 43b70deccb -s ours
am skip reason: Change-Id I021f59bb91572d28798a97ab8aa687b684599d6c with SHA-1 b2cf181a01 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13776605
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I387ac0e35d06a1b21315fdcc4e46d85af2a982c7
This commit is contained in: