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

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

Change-Id: Ic6c23ecb8804ac4099c60ab5be7b241079117310