[automerger skipped] Merge "Mark inheritable policies for clone profiles" into...

[automerger skipped] Merge "Mark inheritable policies for clone profiles" into udc-dev am: f26688cb am: 68a7edea am: 65b2dc33 -s ours am: 92b994d9 -s ours

am skip reason: Merged-In I767f612101a6ca6449b58839dcae21ad65c2b91b with SHA-1 04b4c2e9 is already in history

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



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