Merge "Avoid sending the package-specific BATTERY_CHANGED as sticky bcast." into main