Merge "Fingerprint navigation settings is a secure setting"
am: ccf1064825

Change-Id: Ib45e3feff0ca9d8ee55b1a23e170436bd9b5f0eb