[automerger skipped] Merge "Add ktlint to preupload hooks" am: ff17b0826b -s ours am: c1284335a9 -s ours am: 0f0273763b -s ours
am: 6d344d1255 -s ours
am skip reason: change_id Ie8659765b674ac7b2d82ed3d343f387195c07d83 with SHA1 ae7ced2f95 is in history

Change-Id: I62c08eaf55d2195bf6929e950cd840f6ba9ea265