Merge "[PM] Fix the typo for dumpsys package -h" into main