Merge "Add EXCLUDED_CRATES and better default names" am: 1604140fca am: 4ca8702740

Original change: https://android-review.googlesource.com/c/platform/development/+/1362349

Change-Id: Icb82ed4794fed021e26343d806f5cc50db877431