Merge "No autofill password when in PIN settings" into oc-dev
am: 3decc865dc

Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32