Fixing NPE in device policy tests
am: 68a2a0feed

Change-Id: Ic637f7380d674e17b82ce417df82b8e940f92aa8