Merge "keystore2 compat: stop crashing without hwservicemanager" into main