Merge "Fix clang-tidy performance warnings in frameworks/base." am: 4a2dd10d83
am: 18242e5c08

Change-Id: Id6149de2848d7c0bb77aa04cc523e29498b8bbd1