Bring back v1.61 PKCS12KeyStoreSpi behaviour.

BC 1.68 does not allow non-empty password for a keystore that does
not require one.
Upstream change: https://github.com/bcgit/bc-java/commit/a2e6598949ee83c8c23b98a372749ca378342706

Bug: 181188659
Bug: 179780002
Test: checked manually logcat for NPE entries on toggling WiFi ON/OFF
Change-Id: Ia9ee55dd99453af359babf4f23d0c5b8e4843878
3 files changed