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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2afbce697848641fe7fda09f63601829107bac58