Merge "Add support for non updatable system server stubs" am: 2dada8fb13 am: 574d2b636f

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1587431

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82a902b05e24610b2b1d7cabfff0f1d69432eae1