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

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



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