Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev