Merge "Update manifest to account for new startup library" into sc-dev-plus-aosp am: 6ccde7373b am: fa17418c1a

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

Change-Id: I0933a215e66dd73dd71c2de9085a08ea7bf5c19d