Changes to deal with restrictions API change

Bug: 8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
3 files changed