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

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

Change-Id: I794d76e56c0615759d5702fd2f3a49f35b576fd2