Merge "Check for ProjectID enablement made more performant" am: 706e0ec7c3 am: d603b74d6c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2038669

Change-Id: I87aeb22fb9c59f2f0bb4e76f0823146b32a41c0e