Merge "Fix DynamicSystemClient.start() exceptions" am: f2bf58fb9b am: 318dd035a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29f91caa3f49d5961f736cee9a809c687e00d47b