Merge "Enable ProjectID by default." am: 29e218afd6

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

Change-Id: Id87779000ce07048864c0959cdb682b861529810