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

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



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