Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
am: 74eb4a5226

Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075