[automerger skipped] Merge "Fix javadoc for Context.TETHERING_SERVICE" am: 57d570c8d4 am: aabf397cee -s ours

am skip reason: Change-Id If75f590da17f07ea9d65635065689d8f4e17b40f with SHA-1 d06f14700f is in history

Change-Id: I17f975e84517f1aaefc8e65c6be50b70eda42341