Merge "Fix javadoc for Context.TETHERING_SERVICE" into rvc-dev am: 1f0355a1 am: 18441899 am: f1e546d5 Change-Id: Iee0a4f5ac2aa3e0bbcf98945e848d31fbd446438