Merge "docs: Update EditText JavaDoc comments" into oc-dev am: cc7f08e997
am: 81a1217b71

Change-Id: I662863c366fafe6b9744eb3e7ae4c336f3f136a1