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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77fc78044c1f04b55612247509a426a652c38be9