Merge "Fingerprint navigation settings is a secure setting" am: ccf1064825
am: 85f47ce5aa  -s ours

Change-Id: I6213d4a0aed834e46f256c30bb75dc2881cd5bf5