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

Change-Id: I3cd6b39d0b979a07a7021dbaf6f7766ea9ebf7e2