Merge "Reenable running metalava integration builds" am: f7a38dda2b

Original change: https://android-review.googlesource.com/c/platform/tools/metalava/+/2019375

Change-Id: If8b002aee6a75c1c7267775f8a68d8d616032af0