Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f
am: 96d506af85

Change-Id: I67da9e4d4a2500d08b0db58f1bff5ad793e3a852