Merge "Enable ProjectID by default." am: 29e218afd6 am: de26b580d7 am: 7c606c05ed am: d8c1cc4e7c am: 7f922f78f6

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2030163

Change-Id: I485896da6f19b3fe94062a4b2079db0afe16cc71