Merge "Merge "Fingerprint navigation settings is a secure setting" am: ccf1064825 am: 85f47ce5aa  -s ours" into pi-dev-plus-aosp