Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1c5f0f58b91016be9a4f7b75ff03ad218b623d3