Merge "Changed how user restrictions are pushed to UM" into rvc-dev am: bb5e6b49a7 am: 6cfe1037ca am: 5294b9b3a3
Change-Id: I9769b807b931f2d71ca86583e93b7ccb11fcdb82
This commit is contained in: