Merge "Fix javadoc for Context.TETHERING_SERVICE" into rvc-dev