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

Change-Id: I4ceab5f584e4a002372a2f84106b9d2476a08584