Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5 am: d94cc681 am: 05efd16c am: e6f8904c Change-Id: I99478a82c9b9db6147836e6e3ad053f2d767f9a7