Merge "finalize_branch_for_release: Don't build droidcore" am: 072fb49b am: a0dd90b8

Original change: https://android-review.googlesource.com/c/platform/build/+/2293481



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