[automerger skipped] Merge "Add a runtime check to ensure that system server...

[automerger skipped] Merge "Add a runtime check to ensure that system server jars are prefetched." am: 990ac01f am: a80c2cd0 am: cdeb61eb -s ours am: d52a611d -s ours

am skip reason: Merged-In I275d75ac37194a4d8fd491529b7cdb697dc04e37 with SHA-1 418ab821 is already in history

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

Change-Id: I8596e70159e063848fe13ea3006e5766789b196c