Merge "Fix javadoc for Context.TETHERING_SERVICE" am: 57d570c8d4

Change-Id: I5f131da46621f942c80b5740bb7bd7aabe52b4ff