[automerger skipped] Merge "Allow CBR when device owners is set up" into...

[automerger skipped] Merge "Allow CBR when device owners is set up" into rvc-qpr-dev am: 76f79a77 am: c36300a0 -s ours

am skip reason: Change-Id I98ac9eecd8a497541d9ce0761920db1252eb72e0 with SHA-1 554e10dc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f2103630fc6a8d72672868b6979f3a0a6769b39