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 am: 3bd6db2d

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



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