Hi,
I am having the same issue on my S7 Edge with 6.0.1
I have booted into safe mode but do not get the password prompt you speak of.
To clarify, are you saying you changed the startup/lock screen pin for your phone or changed a password related to one of the Airwatch apps (i.e. Airwatch...