[automerger skipped] Merge "Remove legacy activity starter code" into udc-dev...

[automerger skipped] Merge "Remove legacy activity starter code" into udc-dev am: 2222c55f am: ec98fa0f am: 2a2f9e68 am: df364941 -s ours

am skip reason: Merged-In I73af77466f4a199dd743e62e48f7040c36e8cd8f with SHA-1 73af217e is already in history

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



Change-Id: I79b0ebbd8cd801dc95a585389980df9f519a87d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>