[automerger skipped] Merge "Create non updatable system server stubs" am:...

[automerger skipped] Merge "Create non updatable system server stubs" am: 359eca32 am: a03cf88e am: 88e092a6 -s ours am: b7c2f8d7 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic27b3fc1dedcaed83f342ced7a11634587ee9fc6