Merge "devicepolicy: fix javadoc typo" into tm-dev