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