Merge "devicepolicy: fix javadoc typo" into tm-dev am: 5f50853c am: 5b2ec199

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17733166



Change-Id: Ifb4c27cbee73652658830f754db80570b85ff816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>