Merge "Fix clang-tidy warnings in drm." am: e055519839
am: aee0669a7b

Change-Id: Id1ad8443f50518c9fff322624db0bda23a0bcf62