Merge "Update javadoc for INHERIT_DEVICE_POLICY" into udc-dev am: c3aa90852e

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

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