Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8
am: 201cda71a6

* commit '201cda71a62371a6c5a870498734de15bc1a59c6':
  Update Sample Device Admin

Change-Id: I2e275518fde4fc11d4bb9afa023e2ecca4a0c3da