am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and...
am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
* commit 'db82c17f':
Now showing unlocked icon if both trusted and fingerprint running