Merge "Remove redundant debug flag. dumpsys result https://paste.googleplex.com/4984316764356608"