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

Change-Id: I93cea5354f66909945497201f2c3e57cb33f183b