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

Merge "Update javadoc for INHERIT_DEVICE_POLICY" into udc-dev am: c3aa9085 am: b7684ef8 am: 0f1472b0 am: f62a8ec7

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



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