Merge "Re-enable backup dumpsys in bugreports, and remove some behaviour change introduced after ag/26833810" into main