[automerger skipped] Merge "Update manifest to account for new startup...

[automerger skipped] Merge "Update manifest to account for new startup library" into sc-dev-plus-aosp am: 6ccde737 am: fa17418c am: d73efea7 -s ours

am skip reason: Merged-In Ia896ab92921807a343482c080f8e45b117596ba2 with SHA-1 e9c01cf1 is already in history

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

Change-Id: I86fa9cf6505eff7e58802899811808998765fc79