Merge "Fix clang-tidy performance warnings in frameworks/native." am: 5ec3274b10
am: 2f7048b930

Change-Id: I1eb7cbc2900d9919678bc613d197c33389de5e31