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

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

Change-Id: I52e797c1dd124563dad22d7dbe746ffee7c1e32c