Merge "DO NOT MERGE Add commented-out "kotlin-annotations" dependency to service-permission for consistency." into tm-dev