Merge "Update javadoc for INHERIT_DEVICE_POLICY" into udc-dev am: c3aa90852e am: df5b191d6d am: 3934dd543c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23468177 Change-Id: I231bd7633e1fe178e59e5a8d211232c79a883d4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: