am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.
tree: 02cbf8421d6b998bf76e2b5b75cde48fc7904f41
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml