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

Change-Id: Ibf5e21e8a8d8746a5598c9e3d1d1a3358aad00f3