Merge "[rkpd] Move watchdog calls from rkpd_client to keystore2" into main