Merge "Revised API documentation of Context and ServiceConnection. See b/213625234."