Merge "Disable ktlint formatting checks in frameworks/base/" into tm-qpr-dev-plus-aosp