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

[automerger skipped] Merge "Update manifest to account for new startup library" into stage-aosp-master am: 902b8e2d -s ours am: 7e0411b5 -s ours am: e2a320a1 -s ours am: 7c4320bd -s ours

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

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

Change-Id: I6d143e14a919c7a7927c12db6c3520bd8e3c0d99