Merge "Keystore 2.0: Install database busy handler."