Merge "Rename device management role holder role name" into tm-dev am: 1cb9022785 am: 9834db94a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16991527 Change-Id: Ia1c620b41f89acc7b24f63793d4d5a821b2ba525
This commit is contained in: