Merge "Apply android.jar defaults to system server stub" am: ded63422 am:...

Merge "Apply android.jar defaults to system server stub" am: ded63422 am: 03ec0441 am: b7e8c45f

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



Change-Id: Ic1fa81e28cd13ef64b03d537a03ea5dba44d4408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>