[automerger skipped] Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd am: 88e092a602 -s ours

am skip reason: Change-Id Iecb9d51472ae238bbeabe65e1cd782b7c8a4ce59 with SHA-1 43114704e6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3235ecaf3908dc51f118251681ffdccda96f49f