Merge "Switch from `count` to `N` for template due to ambiguity with `std::count`" am: 3db19cfa0b am: 2324c8b96c

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1363328

Change-Id: I27a7b07d5057b7f936798dc6891984457f7304e5