Merge \\\"Fix clang-tidy performance warnings in system/security.\\\" am: 4f987e61af am: acc171bee2
am: e2180dd3d1

Change-Id: Ia336ac922eb1d88febd1525af636b7a628ed5cb3